Merge branch '749-ism-metadata-public-structures' into 'main'

Resolve "split rendering public structures names"

See merge request !1090