Boooom

Story-Id: SFT-6
Change-Id: 2502a1012c