Merge branch 'dt/empty-submodule-in-merge'