Merge pull request #3435 from akallabeth/uuid_find_fix