XNIO-150

Implementation ready to review.