Merge branch 'feature_initTestingEnv' into dev