Added updated driver to support 2 pump interfaces
Merged upstream changes