Merge branch 'bugzilla-15951' into release