Missing changes from 2 commits ago
Fixed iteratorHasNext() issues in diag sub views