Merge "update cleanspec for header generator"