Merge changes I9b865c4c,Ib709290e into release-4-6