Merge: from main Tests: Rode the zipline on craggy back and forward, ran around the island and monitored pooling logs