Merge "Make sure views are added back when updating" into main