Beta 1.8.2 Merge

Pre-merge to Master branch. Final commit of "pretest".