Merge "Apostrophe not permitted in macro parameters" into oc-dev