v6.24 changes.