add select_or_other module
Merge remote branch 'origin/dev' into dev