Updated for cf-release 150