IDEX-563: Removed owner field
IDEX-563: test optimizing
IDEX-563:
IDEX-563: merged with master
IDEX-563:
Javadoc fixed