First merge from softbody-picker branch.