ODE-913: backport to 1.3.6