CROSSDATA-185 resolved, some refactor in Planner & some rename from Meta to Crossdata
Finish CROSSDATA-185
Merge remote-tracking branch 'origin/develop' into develop