HHH-8293 map key column is formula
 HHH-7919 : Miscellaneous bugfixes
HHH-7919 : Miscellaneous bugfixes