Merge "Support config dir for env generator input files"