This is not compatible with https://github.com/PX4/PX4-Autopilot/pull/16243/files#diff-e4b611e75eba3844661619867ee06befbcf230aced354a14f167f7d0ebbca8e0R1913 but I can rebase and resolve since the other change is much simpler.