fix EPR 398167, 398501 + documentation fixes