Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev