Merge branch 'bugzilla-15100' into release