Backport bge driver from 8.4-RC1