MANTA-17 moving align end to inline function