Fix merge issue with SAS interface changes