[S2FS] Preparation for CoreBundle