Continuing on the SGI GBE refactoring...
Authored by: gavare 2019-06-07
Parent: [r6012]
Child: [r6014]