[966896] Addressed feedback