Merge "Fix index error" into pi-dev