Merge "Properly merge two different real time modes"