Merge from branch ReactX to Trunk,