Swap to BON and Fix an issue with gradle not merging ATs properly