Commit before 7.24 update