Fix bootstrap for non-test env
Merge branch 'master' into features/CHERKASY-102_implement_highdim_resource