issue #21684: added workspace. basic tests all pass