Merge 9.18.13 release branch

Merged Tom Krizek requested to merge v9_18_13-release into v9_18

Merge request reports