201403 upgrade merge - round 1