Merge branch 'bugzilla-16357' into release