changed field, elementId to fix ruby tests and other issues
Merge remote-tracking branch 'origin/master'