Backport some things from develop-frontend.
Backport go_api changes.
Merge branch 'feature/issue-549-backport-some-stuff' into develop