Merge pull request #4764 from davidhorstmann-arm/development

Remove redundant hash len check