update 2021.2 with new master that includes service-hotfix

Richard Wohlgemuth requested to merge master into 2021.2

Merge request reports