WIP: Resolve "release changes for 1.6.1"

Michal Nowikowski requested to merge 1014-release-changes-for-1-6-1 into v1_6_0

Merge request reports