Remvoe doxygen TODO
Support create/merge functions