refactored with submodules, fix some 32/64 bit problems. Testd on srv-ds-sre-01
Merge details
added BUG label
merged
mentioned in commit 6306b1d0