Changes for the next patch release