Handle empty $@ correctly
Merge branch 'v3/5880' into branch_v3_2_4_rc