Merge "Revert "Extend EVS interfaces and data types""