Merge branch 'change/45808/2'