Merge from DEICH-445 accidentaly reverted pickupnumber fix
This tag has no release notes.