Merge "EMS Driver add new functions"