Merge "Enhancement for group operation in output switcher"