Quick fix for module router
Merge branch 'dev' into cleanup-hubert
Fixed array splicing
Fix splice