[CPWG] Issue with CPWG handling of comments