Merge "Migrate away from listening for main/side specific stage types" into main