KNIFE-368 merge