Merge branch '1360-mkenums-tests' into 'master'