Merge branch 'bugzilla-15886' into release