common to 17

Signed-off-by: Expleo <michal.kramer@expleosoftware.com>