IDEX-586: added exceptions to methods declarations
Merge branch 'master' into IDEX-586
IDEX-586:
Merge branch 'master' into IDEX-586