Merge branch 'korina-performance-fixes-and-cleanup'