(NO ISSUE NUMBER) Fixing additional merge issues