Merge "Reorganize project feature config options"