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