SP-678 - Backporting ANALYZER-2174
Merge pull request #1005 from rmansoor/5.0

SP-678 - Backporting ANALYZER-2174