Sage's code review changes to be squashed