Minor changes for CROSSDATA-270
Planner modified for CROSSDATA-270