Merge branch 'bugzilla-14700' into release