Merge pull request #25141 from rhcs-dashboard/wip-37293-master