Merge "Fix incorrect submodule subscriptions" into stable-2.9