Bug composer 

Change-Id: I64fba6591243a2aff167d8aff5463fda5cabfaf2