posted V2 patch @ https://code.illumos.org/c/illumos-gate/+/3560. Please review