Master to dev for release 0.8.5