Merge branch 'hotfix/heatmap_results_5'
Better marker window.
Merge branch 'hotfix/heatmap_results_6' into develop