Hi <@U68QNGBDG> and <@US6N4SCTF> updated the pull ...

# chucker

[Nikhil]

Hi @MiSikora and @Vova Buberenko updated the pull request as per the code review discussion.
Please review and let me know if any changes required again.