#4: inset status blocks for consistency
Merge remote-tracking branch 'origin/gaps' into gaps-next