Merge "DifferenceEngine minor fixes"