Merge pull request #5180 from jansupol/j2.38.merge.1

Merge remote-tracking branch 'MSTR/master' into 3.0.x branch