Updated v2 to latest from master