Closes #22532 Co-authored-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
* render components based on the annotations * merge fix