DEPL-7620 Implemented review comments