HHH-7909 : Add support for non-basic map keys