Merge "Further QIndex realted Fixes:" into experimental