BC-1029, BC-1039 #resolve.
1. Fixed.
Merge remote-tracking branch 'origin/2.0.x'