Merge "Use | not ," into sc-dev