Basic GA integration, fixes #4180