Bump nokogiri version and remove value set caching
Merge branch 'develop'