Improved way of handling static initialisation of sysMap
Merge branch 'development'