Merge branch 'rewrite_noncompatible'
Added SHA512 for entry