fixed merge EPR 391725