Satya, Basvi - Bug Fixes

UAT bugs 3582, 3532