LPS-46764 Avoid some redundant indexations
LPS-46764 Autogenerated