adding support for making default site optional
Merge branch 'feature/default-site-optional' into develop