Cleanup/release 3.3

Roman Winterrequested to merge
cleanup/release-3.3 into master

Fixing error and deprecation warning of release 3.3

Merge request reports