Merge "Update genfiles script"