Merge survival mod (4/18)

Merge survival mod