SOC-4118: Fixed the issues raised