Merge "Improvements on ViewNodes received on partitioned requests:" into oc-dev