updating
Merge pull request #268 from atomical/task/update-matterhorn-with-conditional-hls-distribution

updating