Merge "Fix input for embedded surfaces"