The system has been upgraded from jessie to stretch. The problem is now worse.
Not only does it merge all the workspaces into one now, but after using the laptop with a large screen and then undocking it and opening the lid to use the laptop screen, I find that I am looking at a cropped section of the workspace and I have to use the Thinkpad function keys to force it to resize and show a proper desktop.