Merge "Made Element accessors thread-safe" into nyc-dev