Merge pull request #2018 from ilya-lavrenov:tapi_dft