Again fixed pick/drop CP bug.
Merge origin/master