Merge "Refactoring of CrossSimRedialingController for plug-in architecture" into main