Merge "Expand submodule subscription support"