Merging release 0.8.5 branch from master to dev