Add comment
Merge branch 'v3/6194' into branch_v3_2_5