merge design into update-1