Merge "Rebase Interoperability third part: handle stop upon conflict"