Merge branch 'bugzilla-14379' into release