First Move merge for 1.55

[SVN r85442]
Last merge for 1.55

[SVN r85702]