Merge branch 'bugzilla-9761' into release