Code, test and build updates for 2013-06 schema