Merge branch 'release/3.1.0'
Merge pull request #27 from alberts-tid/task/fix_delete_error_concepts

fix delete error concepts
Merge remote-tracking branch 'upstream' into task/rpm
Merge remote-tracking branch 'upstream/develop' into task/rpm