Merge "Cleaning up some no-op calls during workspace binding" into main