Merge branch 'bugzilla-13449' into release