Merge "Made Element accessors thread-safe"