map and config hardcoded
Merge branch 'standalone' into develop