Merge branch 'bugzilla-11539' into release