Merge pull request #22359 from pprindeville/cligen-initial