Merge pull request #6936 from illume/upstream-project-header-action-navigation-0051