update to 2-1-stable