Merge branch 'feature/reduce-complexity' into develop