Merge commit '6dd8a9351b651c8e85271660fcb2db80328a7b94' * commit '6dd8a9351b651c8e85271660fcb2db80328a7b94': Add error code column to SMS