Merge branch 'bugzilla-16422' into release