Revert "Merge branch 'b5'"

This reverts commit a56a2077ba8bdd89f9e297553c202ea708bc89d9, reversing
changes made to 861748972d6a751a1dfaff7ae6a36e6b6044f4cf.
Revert "Revert "Merge branch 'b5'""

This reverts commit affc985bb7be377f5113668ef108d921731ad16d.