Merge pull request #2034 from alexrp/ctx-cleanup