core tapi optimization
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt