Merge "[Compass] Add new scenarios"