nimrod: 0.9.6 and HEAD.

This is the successor of #34693. It includes the changes from the suggestions in the upstream RFC.