Merge branch 'sg/test-must-be-empty'