codebase update 20140801