Merge branch 'bugzilla-14129' into release