[PLT-341] Incorporated review comments