Test both gradle mvn
Handling proceeding whitespace or new line
Merge branch 'master' into update_driver_api