#7 ccbee now compiles with current tp-prod HEAD