Merge "Improve Planner stability" into sc-dev