Merge remote-tracking branch 'origin/last_performance_tests' into last_performance_tests
Merge branch 'last_performance_tests' of github.com:osiam/osiam into last_performance_tests