Merge "Fix bug: Some targets will have wrong sub-label"