Compass Boot up Issues

I have 2 copter both with Cube Black and Here GPS after upgrading to 4.03 I have noticed an issue with the Compass ID on both copters if I boot the pixhawk using USB Power
COMPASS_DEV_ID1 = 466441
COMPASS_DEV_ID2 = 531465
If I boot using the main battery
COMPASS_DEV_ID1 = 531465
COMPASS_DEV_ID2 = 466441

Compass Type Mask is set as follows

Please open a github issue.