Merge "Create DifferenceEngine before calling GetDifferenceEngine"