Upgrade to chorus 1.6.9