I merged Hamza’s work on #610 into master. I was pleased to see that he he did everything “right” without any further instructions.