added option. in a number of places
Merge branch 'hotfix/null_for_project_and_repo'