merge changes for TLPORTAL-50, TLPORTAL-21, and TLPORTAL-73