Merge "Delay index job a little bit" into pi-dev