Fix/3.2.x/exogtn 1409