Issue #21587: Finished configure workspace