HHH-8171 - SETORDINAL to support set of embeddables
HHH-8171 - Cleanup