4 Dec snapshot of v5.24.0