Closing doxygen groups
(cherry picked from commit 25c8b0835dca6bdfe939678193b8b8bf049396cd)