Merge branch 'bugzilla-23002' into release