Task/16622

Alignment with Affine gap
with tests