A few cosmetic changes
Merge branch 'v3/3884' into v3/5579_v2_5691_3884