BS-10723, add the assembly