Port to Gnuradio 3.7