Fixed EDGE-4010

Fixed EDGE-4010