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