Merge branch 'release/7.x-0.12' into develop
945_pickUpAllowed
Tagging version 7.x-0.13
Merge branch 'release/7.x-0.13'