HHH-6613 - Collection of embeddables