Merge from compiler_field_fixes (should resolve prefabs reimporting when changing between Client and Server)