codebase update 20140625