Backport for GTNPORTAL-2072