DF-4306 fixes after review
Merge branch 'tangent_space' into tangent_space_binormal