Merge "Fixed heat resources aptly repo"