Report error code, message and detail in CLI when available
Merge remote-tracking branch 'origin/master'