IDEX-563: Removed owner field
IDEX-563: test optimizing