merge changes from dart-gde:master