Merge "Handle multiple blueprint files in one dir"