codebase update 20140825