Merging release/3.8.5 into master

Apple approved release, tagged and merging into master.