58500284 merge uat and v3