Merge branch 'bugzilla-15064' into release