Merge branch 'bugzilla-14858' into release