Merge branch 'bugzilla-16396' into release