LOOM-1803: Picking up some IME conflict stuff from rebase