Merge master -> dev

Merge master -> dev for 0.8.11 Release