reorder
add changelog entires for when this branch gets merged