Merge changes from topic 'bug-362854'