BP of MB-30495 to 5.5.x
MB-30495 Better identifier handling for Index Covering determination
MB-35732 back out fixes in index covering determination