[dev] trunk unblocked