Post subtree fix (BOMS)
subtree passing tests locally