Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'