get Or implementation
Merge origin/master