Fix of GTNPORTAL-3182