Codebase update 20140709