Hibernate 5 auto-ddl index for column in embeddable object create index on all columns

updating project to 5.2.17 from 4.
Have a very strange situation, let’s say I have a class A, it has some props and a column idxColumn with @Index annotation to add index to that column. Class A also has a property let’s say embeddable which is Embeddable of class B.
Class B declares let’s say 7 columns, one of those columns let’s say EXPIRATION_DATE has @Index annotation
@Index(
name = “IDX_EXPIRATION_DATE_SEARCH”,
columnNames = {“EXPIRATION_DATE”}
)

This results in attempt to create an index IDX_EXPIRATION_DATE_SEARCH but for all columns in that embaddable object:

create index IDX_EXPIRATION_DATE_SEARCH on BLC_CUSTOMER_PAYMENT (CARD_TYPE, EXPIRATION_DATE, LAST_EXPIRATION_NOTIFICATION, LAST_FOUR, LAST_PAYMENT_STATUS, PAYMENT_GATEWAY_TYPE , PAYMENT_NAME);

Try to create a test case that replicates the issue, as explained in this article. Thanks.