MDL-14817 fixing recent regressions