Merges patch from dev-requirement-tests to fix issue with array parsing.