Integrated dev-reskin changes to date