Merge "fix nmea B2AQ issues"