OPAL-2109: Merge changes to ValueTableIndexResource