SKNess-2549

SKNess-2549