Merge "Add button for activating modes manually" into main