backport switch patch