Gtnportal 2857-1

Sending PR from GTNPORTAL-2857-1 branch instead of master.
For clarity in the merge.