Merge "Rebase Interoperability second part: fix "pop steps""