Auto-Merge pull request #2096 from rubenk/target-set-plug-leak