Ajay/Melanie | #2836 | Bug fix - Incorrect DS updated on creating submissions