issue #19261: Various changes to support workspace interaction.