Working on the pick functionality.
Merged from upstream.