v8.2 Code Freeze 2

Minor bug fix in unit planner