Merge branch 'bugzilla-14782' into release