Merge branch 'bugzilla-10695' into release