I forgot to add the authors of r24209 to CREDITS. Many thanks to them!