Merge pull request #4058 from ugbotueferhire/fix/pytest-timeout-mark-clean