Merge branch 'bugzilla-13671' into release