Merge branch 'tr/perftest'