codebase 20141214 update