Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math