Javadoc
Support nested iteration.
Javadoc
Null checks for all properties.

#2030
Merge branch 'origin/master'