NOTICKET: Fix issues caused by merge