Carried over new 201402 fixes from 201402 repo
Carried over fixes from 201402 repo