[ADAM-439] Fix ADAM to account for BDG-FORMATS-35