Merge HTTP interface fix