Merge branch 'hotfix/heatmap_results_4'
Another one bite to dust...
Merge branch 'hotfix/heatmap_results_5' into develop