HHH-8968 - Fix and test by FiatLox