...and adaptation of the users of 'Block::Driver', 'Block::Root' and 'Block::Session_component' to the modified interface. Issue #1987