This MR merges in the latest changes from the 8.x-2.x branch and also adds in the layout builder fix. Closes #3352265