Master: cherry-pick changes for BUG-9223