Merge survival mod (14/18)

Merge survival mod