Merge pull request #318 from mpapirkovskyy/trunk-branch-3.0-perf

Trunk branch 3.0 perf