Merge branch 'bugzilla-13048' into release