Merge pull request #2121 from jokdarius/feature/0001-performace-fix