Merge "Fix API message maps for block errors"