Fixed EDGE-3704

Fix for EDGE-37.4