[Fixes #61511410] Addressed remaining code review items from Marat.