Merge "Bug 3136: Delete output port from instruction should use order instead of...