SOS-1971

Master only. Already done it in ee-6.2.x and 6.2.x