We will have to send that map at some point
Merge remote-tracking branch 'origin/dev' into dev
Update everything to StatikDataMap. Even StatikDataMap.