STORM-80 : Fixed corenova-storm with process management
STORM-80 : Fixed merge conflicts