Updated v1 to latest from master