Merge "Remove obsolete configs from fs_config.cpp" into main