Rebuild using latest commits from v1 branch