Dev+ copy changes + consistency fix