Merge branch 'bugzilla-12270' into release