#133: resync cuke with new code