Merge to fix or_other bug