issue #21604: finish workspace and clean up diffs