Add FIXME comments referencing #6894 and #8888