Merge "BUG-2708 : fixed failing tests"