Fixes: CA-150023,150019,149973,149970

Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>