Merge branch 'bugzilla-13036' into release