Merge "Revert "Temporarily enable GL validation"" into oc-dev