FDM and delete afdi from -set.xml
Merge https://github.com/bitwisetech/beech-v35