BS-2821
Merge parent project and assembly