Merge branch 'cb/parse-magnitude'