Merge "Fix rotary highlights" into sc-dev