Merge "[Catalyst] Include dynamic icon into graph" into main