Merge pull request #12821 from mattwire/updatesubscription_fix