Merge pull request #5900 from bradymiller/rwt