changes related to User context check : On Behalf of Ibrahim