uiv2 branch migration & python api fix