Merge branch 'bugzilla-13620' into release