Merge "Remove MainStage class" into main