Merge branch 'master' into develop
Merge branch 'feat/1751-fieldtrip' into develop
Merge branch 'master' into develop
Re #1709 Corelib reorganization
RE #1709 Fix for Corelib re-organization
Re #1803 fixed insane check
Merge branch 'feat/1709-codecleanup' into develop
Re #1709 Fixed missing dependencies
Merge branch 'develop' into test