Merge pull request #14116 from rohitwaghchaure/project_heatmap_issue

[Fix] Heatmap issue in the project