Upgrade to work with API v1.1
Force merge.