Merge remote-tracking branch 'origin/fix_deploy_modules'
Added testing option to VGL
Testing for undefined var should be enough
Merge remote-tracking branch 'origin/vgl_enable_testing_option' into next