Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release