@linuxmaniac: that's about the current patch of this PR, right? I wanted to clarify if @Ozzyboshi wants to propose another improvement that covers the case of current PR as well.
From my point of view, the PR can be merged, if no improvement/alternative is been planned in the near future.