Merged ubx driver part of pull request #1031