Merge pull request #18015 from demeritcowboy/resubscribe-missing