Resolving this issue as we are now handling the changes seperately. See attached epic for further details