Merge pull request #455 from martinbudden/inav_bf_catchup2