BC-1340, BC-1341, BC-1342 #comment not complete..
Merge remote-tracking branch 'origin/2.0.x'