Upgraded plugin-api to 3.9.0-alpha-36