Post-codereview updates #HOT-61