Merge branch 'master' into IDEX-1272