Rework the HOT composition section

Change-Id: I7ed0cee9e8715c5f1a7542e4e2bdc1a127b91266
Merge "Rework the HOT composition section"