#1989: Upgrade to curator 2.6.0