Issue #20715: Fixed error in workspace load