BC-1354 #comment
Fix some miss.
Merge remote-tracking branch 'origin/2.0.x'