Merge "Speed up of message backup/restore" into nyc-dev