Merge branch 'bugzilla-16244' into release