Seems this was fixed as part of https://hibernate.atlassian.net/browse/HHH-15349#icft=HHH-15349 in 6.1.1