FEND-849 post code review and uat corrections