update with Agenda-0628