Affine2 - minor tuning
Merge pull request #2435 from vmilea/optimization

Affine2 - minor tuning