New planner commits merge into dev branch.