Merge "Updated switches Bug: 5076695"