WEB-388 fixed a few changes stemming from merge-related accident