Heat GBP related changes