Merge "[GENERAL] Fix setting of HELM_VER variable"