HHH-7919 : Miscellaneous bugfixes
HHH-7919 : Miscellaneous bugfixes