Merge changes from 4.1-dev for TRQ-1528: Torque 4.1.x Memory Issues.