Changed to use options
Merge branch 'possible_to_run_full_scan' into local_changes