Merge "Revert "Do not allow wildcard matching in GL loader."" into udc-qpr-dev