set default values for flags (bugfix)
Merge branch 'master' into 2.x