Ajay/Melanie |#3949| Fixing calculate concat for edit scenario