added flags broke the dump function in some cases
Merge branch 'master' into portable