Merge pull request #17269 from greenpeace-cee/simplify-length-test