Bugfix
Cleanup // documentation
Merge branch 'feature/16445_bug' into develop