Missing flags
Merge branch 'enhancement-#62' into develop