BZ-12980:Perform Client Side Changes