#394 - corrections after failed merge