View resolutions to branch 'composite-view'