IDEA-132440 (tests updated)
IDEA-132440 (quick fix corrected; cleanup)
IDEA-132440 (more straightforward element lookup)
Merge remote-tracking branch 'origin/master'
IDEA-CR-880 (utility method used)
notnull