Move view utils branch up