BC-1449 #resolve
Merge remote-tracking branch 'origin/2.0.x'