Satya - Bug fixes

UAT bugs 3219, 3220, 3425, 3463, 3506, 3305, 3006, 3293, 3534