Redo Autscape stuff in develop
Merge branch 'develop' into staging