[MERGE]: merging from the trunk latest code