Made Changes pertaining to task DO-5232