Merge pull request #641 from martinbudden/bf_target_defaults