Reverted CMF referenced back to 3.2.1