Added fix for EPR 397932, 392206, 397524