Update with the latest version of the v2 (commit a020fef5d14e311d441460859cf5d904fc86f172)