Merge branch 'bugzilla-21212' into release