Resolve "Release 2.1 cleanup"

Ille, Ondrej, Ing.requested to merge
193-release-2-1-cleanup into master

Closes #193 (closed)

Merge request reports