Merge branch 'bugzilla-14483' into release