More merge conflicts. Taking main changes then will integrate mine.
For performance effect. I changed all static meshes to soft value.