preserve order_date across package changes, #25130
be more generous in allowing location editing in place, #25130