Btw, is this part of commit (merge_solution modification) is necessary to fix bug?