moved "index_in_template" to a separate variable to clarify what it is
Merge remote-tracking branch 'upstream-pull/2060/head' into turbo
Merge remote-tracking branch 'upstream-pull/2061/head' into turbo
Merge remote-tracking branch 'upstream-pull/2099/head' into turbo
Merge remote-tracking branch 'upstream-pull/2106/head' into turbo
Merge remote-tracking branch 'upstream-pull/2114/head' into turbo
Merge remote-tracking branch 'upstream-pull/2115/head' into turbo
Merge remote-tracking branch 'upstream-pull/2120/head' into turbo
Merge remote-tracking branch 'upstream-pull/2142/head' into turbo
Merge remote-tracking branch 'upstream-pull/2145/head' into turbo