SEVERA-63

SEVERA-62
SEVERA-64