Merge commit '2835391c1709a2b655940200dab0fc74ef08512d' * commit '2835391c1709a2b655940200dab0fc74ef08512d': Update switch call and accept call.
Merge commit '2835391c1709a2b655940200dab0fc74ef08512d' * commit '2835391c1709a2b655940200dab0fc74ef08512d': Update switch call and accept call.