Merge develop into master for v1706 release

Merged Admin requested to merge develop into master

Merge request reports