Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release