patch to build core with trunk