201402 upgrade merge - round 2