Merge branch 'bugzilla-16271' into release