Merge 9.16.39 release branch

Tom Krizek requested to merge v9_16_39-release into v9_16

Merge request reports