1.x copy/paste into branch