Two stage

Please be clear about which issues you think should block a merge.