Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release