Merging master -> dev for hotfix release 0.8.10.1