collapse multiple comments into single c-stmt
Merge branch 'master' into ivory-model-check