Updated cakefile to latest
Merge branch 'dev-exitcode' into dev