shelf changes (ClassB2)
Merge remote-tracking branch 'origin/B1' into B1.2