BS-2821
Use new assembly