Merge branch 'feature/tabbed-fields-convenience' into develop
Merge branch 'feature/hide-from-south-option' into develop
Merge branch 'feature/complex-inheritance' into develop