Merge branch 'bugzilla-13002' into release