Complete Zit3147 for Testing
Zit 2832, 2833, 2923
Integer -> String (comp. 1310, 1461, 1534)
Merge branch 'dev' into bugfix