Merge branch 'bugzilla-13745' into release