[PLAT-6703] Added changes related to comments in PR