Updated GVT
Merge branch 'hotfix-5.0.1' into support-5.0