Sorry, late to the party, but what's the status of #6679?