Revert "Merge remote-tracking branch 'origin/devel-B'"

This reverts commit 532e5fe0817bf48a01f3d751aca80bb663fcc8ac, reversing
changes made to bf602ccae4806350323c4e78d73c101a301bfb9c.