Merge pull request #368 from syncfusion/paulandersons/perf-improvement