HHH-7919 : Miscellaneous embeddable bugfixes