Merge pull request #1902 from ilya-lavrenov:tapi_arithm