Merge "remove update-super" into main