Merge "DefaultSettings: Fix doxygen warning for missing @endcond"