Merge of heat branch with master branch