SOS-1592 import for ee-6.1.x and 6.1.x