Merge branch 'bugzilla-11312' into release