Merge release/v096-candidate @ b139a1c83d — the v0.96.0 consolidation train