KaTaSLiN-2527

KaTaSLiN-2527