Listed new options
Merge branch 'dev' into v4