Made changes pertaining to Task DO-5232