Merge branch 'bugzilla-12249' into release