N3079

Redrafting: issues 667, 861, 990, 818