Merge branch 'bugzilla-15749' into release