@timgraham So the condition for skipIf remains the same, I believe.
So can it be merged now?