core: fix message ordering and add custom storage dir support for migration