Bugfix #0000199
Bugfix #0000175
Bugfix #0000209
Bugfix #0000216 & Feature #0000145