v1.38.0 - #24698633