Merge "Adding extras for output switcher slice"