Merge "Fixed incorrect merge service state"