codebase update 20140807