Merge pull request #775 from stevewithington/develop

bug fix: data response list view error
Moving change from humbucker
Moving change from humbucker