Merge pull request #3338 from lambdageek/dev/plug-ptrarray-leak