SP-678 - Backporting ANALYZER-2174