[MERGE] Merge with trunk upto revision no 1218.