Merge branch 'sb/clean-test-fix' into HEAD