Feature/dcb 178 squashed/release/pebbles/master

Heat related commits after squash