Bring last minute v2.2.0 fixes back to develop #343

Closed ed-xmos closed 9 months ago