Merge remote-tracking branch 'origin/bugfix-add-error-indication-handling' into develop_integration_2018_w19