Merge branch 'release/4'
Merge branch 'release/5'
Merge branch 'release/6'
Merge branch 'release/7'
Merge branch 'release/8'
added option. in a number of places
Merge branch 'hotfix/null_for_project_and_repo' into develop