945_pickUpAllowed
Tagging version 7.x-0.17
Merge branch 'release/7.x-0.17' into develop
Merge branch 'develop' into feature/762_sbkopi