* Better handle octet stream case * Use data source config stack options * Use immutability helper * Use immutability helper (update) --------- Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>