Revert "revert double wrap for dev release"

This reverts commit bf7039fc98c7e6ca0f9c06970a8c1b48c2832d77.
Merge branch 'marvin-math-fix' into dev