Merge branch 'bugzilla-11917' into release