Merge branch 'rs/perf-repeat-thrice-by-default'