Feature/of net

Merge branch 'feature/of-switch' into feature/of-net to catch all changes.