Diff for cf-release 178