In order to implement this behavior, we move first the source location in the quantities to pick. issue8076 review68471002