[MERGE] Merge wtih trunk upto revision no 1046.