merge latest fluid-doc seed changes