Merge branch 'feature/configurable-main-branches' into develop