Merge "Extend integrity component indexing type identification to also return the key value that the indexing will be done with."