Merge "add heat stack check"