ISSUE ID:- RIC-890