HEMERA-3705: Fix regression of regression