Merge "Merge "Improvements on ViewNodes received on partitioned requests:" into oc-dev am: 05b8b413 am: 5f73ae55"