BC-1844 #comment generate name
Merge remote-tracking branch 'origin/2.1.x'