[966895] Addressed review comments