Merge branch 'bugzilla-13142' into release