Merge branch 'ab/test-must-be-empty-for-master'