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