Release/v2.1.0

Merged Damm Kewl requested to merge release/v2.1.0 into master

Release/v2.1.0

Merge request reports