The weekly backup from Monday took much longer to transfer than expected due to a slow connection (over 4 hours), which is delaying merging and testing the changes from Mastodon 2.7. I should be able to finish this up tomorrow barring any other trouble