KRAFT-38 First Frame fix
KRAFT-38 Frame 2 fix
KRAFT-38 Frame 3 fix