Test for KT-4482

 #KT-4482 Fixed
Test for KT-4610

 #KT-4610 Fixed