Merge "Fix ApiBase::getErrorFromStatus() and ApiMessages"