Merge "sde: strategy interface changes"