Merge pull request #8686 from sovrasov:port_affine3_fix