issue #20771: important crud bugfixes
Merge pull request #556 from shackbarth/20771

issue #20771: important crud bugfixes