Merge "Cleanup project ConfigInfo constructor"