Fixed EPR 400709.
Fixed Linux build Issue
Fixed EPR#392210