Merge 2.066

~~Opened the pull request to get autotester going.~~