Merge "Extend EVS interfaces and data types"