[#860364] Review fixes