merge from TLPORTAL-60