bugfix
Merge remote-tracking branch 'origin/dev' into thomas
typecast bugfix
merged thomas into tcuje, no changes