[BACKPORT] updated views and objects for in and out picking, seems to do what it's expected to do