[SFM | L4D2] Merge