[Discuss-gnuradio] 16QAM receiver fine carrier frequency tracking

In version 3.7.7 GNU Radio added a 16QAM constellation object however there does not seem to be a receiver modem fine carrier tracking block that will handle 16QAM.  The Costas loop block is only good for 2,4, and 8 PSK constellations.    Do you know if any new fine carrier tracking blocks are planned?  Has anyone implemented a GRC 16QAM receiver in any other way that you know of please?

Thanks very much,  John R.