Fix/4.0.x/exogtn 1819