EDGE-1905

EDGE-1905