Support 2012 codebase upgrade