Merge branches 'release' and 'bugzilla-9910' into release