Merge branch 'master' into develop
case 1683 - Emergency object id retrieval.
Merge branch 'case-1683' into develop
Merge remote-tracking branch 'origin/develop'