add some needles to adapt 13.1 RC1