Merge branch 'bugzilla-13751' into release