Merge pull request #22858 from stangri/master-nebula