Make AnisotropicMatrix impl configurable in task
Merge remote-tracking branch 'upstream/master'