Merge "Dynamic output switcher chip and bug fixes"