Note: includes !1878 (merged)
This is superseded by !1929 (merged) - to be closed if !1929 (merged) successful