Merge pull request #90416 from Xazax-hun/no-builting-fix