26 Nov snapshot of v5.24.0