Merge "Transition bug fix"