Updated core from 7.22 to 7.24