BC-993 #resolve.
1. Fixed.
styling
styling
styling
Merge branch '2.0.x'