Merge Dart plugin from master into 135 branch