Merge remote-tracking branch 'origin/0.11.0'