GB Engine

TC link:

/viewLog.html?buildId=12175&tab=buildResultsDiv&buildTypeId=bt7

Waiting for "Maps" to merge to i can get rid of the other commits