In conjunction with #3004099 patch 11 and #3007233 patch 16, allows to support composite entities for #3403755