Manual pull of #3. Fixes workspace clipping into foreground and background. Thanks heldplayer!