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