Merge pull request #3199 from lambdageek/dev/proxy-setter