feature/KRVN-2927