For SVY-6608 : [NG] Portal - mainly client to server changes