Merge "Match the config from ubuntu"