Caves & Cliffs Backport

A backport of Caves & Cliffs to 1.12.2