Draft: Resolve "pre 2.0.2 release changes"

Wlodzimierz Wencel requested to merge 2332-pre-2-0-2-release-changes into master

Merge request reports