Merge "Expand abbreviation in constant identifier." into oc-dev