Deploy v2.1.2

Merged Ruben Backx requested to merge development into master

Merge request reports