Rebased, patch for 830543 landed

--HG--
extra : amend_source : f513c9fffdb4ab457d8502d561e7a338b8d95c8b
Rebase
Make updates from review of 722506
Rebase
Rebase, patch for 722506 landed