GTNPORTAL-2879 and GTNPORTAL-2903

Includes fixes to GTNPORTAL-2879 and GTNPORTAL-2903.