Merge "Make alignment indication red again" into rvc-dev