IDEX-692
IDEX-692
IDEX-546: rename to editor to viewer.
Merge with master