Merge 9.17.21 release branch

Merged Petr Špaček requested to merge v9_17_21-release into main

Merge request reports