Ix 9.19.0 collective merge - SUP-184, SUP-2172, SUP-2375, SUP-2403