Fren4MAN-2510

Fren4MAN-2510