Merge "Deprecate public access to some DifferenceEngine properties"