Merge "Bug: Doctor all does not work"