Gradle Plugin Release 2.3.0
merge in studio-master-weekly history after reset to studio-master-dev