Merge disconnected ops branch.