Merge "Switch DifferenceEngine to the new shell framework"