Merge master into heatmap