SEVERA-38

SEVERA-37
SEVERA-39