Cherry-Picked from https://github.com/AuScope/VEGL-Portal/commit/9d9daca...

...ee330ab738071fb8b4dd56d9bfe521c0a