Merge "Fix error that instance could not be found"