Merge branch 'bugzilla-10237' into test