codebase update 20140829