[966896] Addressed review feedback