Backport some things from develop-frontend. (@Hodgestar)
Merge branch 'develop' into develop-frontend