I messed up with the merge into 2.4, so 2.3 is fine (e0402bae65c239da87774eabb9e3b8f8ecbf2982).