[#916942] Review fixes