Merge "Merge "Removed close guards for Element and Type objects" am: 97c9b57c am: 25684cef am: 04d8f0c8"