Bugfix WB9003
Merge branch 'wb9003'