(J0-3857): Move B-AAEA to the mother; add S1-7080.