Support multiple fill value codes present in a single granule, as originally advertised [1688]