Merge branch 'bugzilla-13865' into release