HHH-8282 composite id with generator binding
HHH-7919 : Miscellaneous bugfixes