=htc #15560 close entity data stream eagerly + more tests + one additional fix