parent issues: 6692,6691. Affects issues #5669, #5668, #5727, of which many have fixes which this overrides