Merge "Heat: check response fields"