Add a note about feature merged upstream