Merge branch 'bugzilla-14081' into release