update model interface
merge upstream
upstream build