update to upstream dev and fixed bug.