Merge "Fix trunk subport scenario test"