The fix got merged to stable branch now. Please reopen if the problem still persists with the test kernel in comment 15.