Merge window logistics and relaxation of submodule policy