Merge pull request #6860 from illume/upstream-0033-conditional-project-overview