STORM-91 - Working on making corenova-storm adaptable to stormdata and stormregistry
STORM-91 : Fixed merge conflicts