Merge branch 'bug/unsupported_options' into develop