Merge branch 'bugzilla-13041' into release