Merged iview into istar/iview