Fix some unique name handling issues#10021

vaisest wants to merge 2 commits into

PathOfBuildingCommunity:devPathOfBuildingCommunity/PathOfBuilding:devfrom

vaisest:unique-name-fixvaisest/PathOfBuilding:unique-name-fixCopy head branch name to clipboard