Merge pull request #13940 from davezarzycki/more_declcontext_cleanup