v1 final commit (sans Azure)