Revert "Merging branch b2 to trunk"

This reverts commit af9a33deba0c60e1cc44db606fab2a4f29185d5b.
Revert "Revert mistaken rebase"

This reverts commit 3bb6c11aaa6ce2a79792bef83dfa277edcd429c9.