#33: Ported Nils's BOM to 2.0