Merge "Fix crash in non-indexable keys collection" into pi-dev