Merge branch 'feature/SLIDER-565-test-JVM-env-passdown' into develop