adjust patch to freeze2014_11