Merge pull request #6486 from DieHertz/bfdev-fix-omnibusf4-target-definition