forgot the files modified by the patch...
Merge branch 'apply_init_patch' into tbtr