Updated for ZCP 7.1.9