Merge "Apostrophe handling in CpsPathParser"