Lacking further input from @naderman or @igorw, I will consider this issue to be something we can potentially look into later if needed. As such, I will test this, do a final code review, and assuming everything is good, I will merge this.