codebase update 20140816