Merge branch 'change/45863/1'