Updated Changes pertaining to task DO-5143