Merge branch 'bugzilla-13825' into release