Merge pull request #2482 from ilya-lavrenov:tapi_fix