revamped mode select
Merge remote-tracking branch 'origin/V1' into V1