Merge "Support general configuration file"