Updated to 0.9.24
p4#: 22242