Merge branch 'bugzilla-14954' into release