Port to 26.2#137

cassiancc wants to merge 2 commits into

sleepingdragoninn:26.1sleepingdragoninn/surveyor:26.1from

cassiancc:26.2cassiancc/surveyor:26.2Copy head branch name to clipboard